Commit 725d21fe authored by Jay's avatar Jay Committed by jay
Browse files

Updates to the control network tests to support measure_type

parent d398a56c

autocnet/fileio/io_controlnetwork.py

+4 −1
Original line number Diff line number Diff line
@@ -161,12 +161,15 @@ class IsisStore(object): 
                point_spec.id = str(pid)

            point_spec.type = POINT_TYPE



            # The reference index should always be the image with the lowest index

            point_spec.referenceIndex = 0



            # A single extend call is cheaper than many add calls to pack points

            measure_iterable = []

            for name, row in point.iterrows():

                measure_spec = point_spec.Measure()

                measure_spec.serialnumber = row.nid

                measure_spec.type = MEASURE_TYPE

                measure_spec.type = row.point_type

                measure_spec.sample = row.x

                measure_spec.line = row.y

autocnet/fileio/tests/test_io_controlnetwork.py

+5 −5
Original line number Diff line number Diff line
@@ -38,10 +38,10 @@ class TestWriteIsisControlNetwork(unittest.TestCase): 
                   self.serials[2], self.serials[3]]





        columns = ['x', 'y', 'idx', 'pid', 'nid']

        columns = ['x', 'y', 'idx', 'pid', 'nid', 'point_type']

        self.data_length = 5



        data = [x,y, idx, pid, serials]

        data = [x,y, idx, pid, serials, [2] * self.data_length]



        self.creation_time = strftime("%Y-%m-%d %H:%M:%S", gmtime())

        cnet = C(data, index=columns).T
@@ -69,14 +69,14 @@ class TestWriteIsisControlNetwork(unittest.TestCase): 
            self.assertEqual('Not modified', header_protocol.lastModified)



            #Repeating

            self.assertEqual([133, 197], header_protocol.pointMessageSizes)

            self.assertEqual([135, 199], header_protocol.pointMessageSizes)



    def test_create_point(self):

        with open('test.net', 'rb') as f:



            with open('test.net', 'rb') as f:

                f.seek(self.point_start_byte)

                for i, length in enumerate([133, 197]):

                for i, length in enumerate([135, 199]):

                    point_protocol = cnf.ControlPointFileEntryV0002()

                    raw_point = f.read(length)

                    point_protocol.ParseFromString(raw_point)
@@ -96,7 +96,7 @@ class TestWriteIsisControlNetwork(unittest.TestCase): 
        self.assertEqual(5, mpoints)



        points_bytes = find_in_dict(pvl_header, 'PointsBytes')

        self.assertEqual(330, points_bytes)

        self.assertEqual(334, points_bytes)



        points_start_byte = find_in_dict(pvl_header, 'PointsStartByte')

        self.assertEqual(65621, points_start_byte)