From 0ad94c89826128cff6b29c2eb829a13a49bf2823 Mon Sep 17 00:00:00 2001
From: jlaura <jlaura@usgs.gov>
Date: Mon, 17 Jun 2019 15:56:13 -0700
Subject: [PATCH] Toisis (#118)
* Fixes key in measure creation
* Bumps minor minor
---
plio/io/io_controlnetwork.py | 2 +-
plio/io/tests/test_io_controlnetwork.py | 4 ++--
setup.py | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/plio/io/io_controlnetwork.py b/plio/io/io_controlnetwork.py
index b979440..bb4036b 100644
--- a/plio/io/io_controlnetwork.py
+++ b/plio/io/io_controlnetwork.py
@@ -259,7 +259,7 @@ class IsisStore(object):
measure_spec.serialnumber = m.serialnumber
measure_spec.sample = m.x
measure_spec.line = m.y
- measure_spec.type = m.measure_type
+ measure_spec.type = m.measuretype
measure_iterable.append(measure_spec)
self.nmeasures += 1
diff --git a/plio/io/tests/test_io_controlnetwork.py b/plio/io/tests/test_io_controlnetwork.py
index 95bb3eb..dc4b1cd 100644
--- a/plio/io/tests/test_io_controlnetwork.py
+++ b/plio/io/tests/test_io_controlnetwork.py
@@ -33,7 +33,7 @@ class TestWriteIsisControlNetwork(unittest.TestCase):
serial_times = {295: '1971-07-31T01:24:11.754',
296: '1971-07-31T01:24:36.970'}
cls.serials = {i:'APOLLO15/METRIC/{}'.format(j) for i, j in enumerate(serial_times.values())}
- columns = ['point_id', 'type', 'serialnumber', 'measure_type', 'x', 'y', 'image_index']
+ columns = ['point_id', 'type', 'serialnumber', 'measuretype', 'x', 'y', 'image_index']
data = []
for i in range(cls.npts):
@@ -54,7 +54,7 @@ class TestWriteIsisControlNetwork(unittest.TestCase):
serial_times = {295: '1971-07-31T01:24:11.754',
296: '1971-07-31T01:24:36.970'}
serials = {i:'APOLLO15/METRIC/{}'.format(j) for i, j in enumerate(serial_times.values())}
- columns = ['point_id', 'type', 'serialnumber', 'measure_type', 'x', 'y', 'image_index']
+ columns = ['point_id', 'type', 'serialnumber', 'measuretype', 'x', 'y', 'image_index']
data = []
for i in range(self.npts):
diff --git a/setup.py b/setup.py
index 5e919a0..de3006e 100644
--- a/setup.py
+++ b/setup.py
@@ -8,7 +8,7 @@ with open('README.md', 'r') as f:
def setup_package():
setup(
name = "plio",
- version = '1.2.0',
+ version = '1.2.1',
author = "Jay Laura",
author_email = "jlaura@usgs.gov",
description = ("I/O API to support planetary data formats."),
--
GitLab