diff --git a/environment.yml b/environment.yml
index f51c74af88f78d0d7468b559581c862cc1172c07..e269724b9a77c1a9f4532b798dbf80dcc28fdb83 100644
--- a/environment.yml
+++ b/environment.yml
@@ -10,4 +10,4 @@ dependencies:
- pandas
- sqlalchemy
- pyyaml
- - networkx
+ - networkx
diff --git a/plio/__init__.py b/plio/__init__.py
index 93c7bd1a1d5edbe537a02e19a586776e0b8c2df4..d3f342b7d48cd4d52201ac799c685be5755e2823 100755
--- a/plio/__init__.py
+++ b/plio/__init__.py
@@ -1,4 +1,4 @@
-__version__ = "0.1.0"
+__version__ = "0.1.1"
# Submodule imports
from . import io
diff --git a/plio/examples/loggers/logging.json b/plio/examples/loggers/logging.json
index b5661386806ac33386e2bcceabe880e3dba03d2f..9492a40719086be7a5ae41e64af359fc8a21eb26 100644
--- a/plio/examples/loggers/logging.json
+++ b/plio/examples/loggers/logging.json
@@ -1,39 +1,39 @@
{
"loggers": {
"my_module": {
- "level": "DEBUG",
- "propagate": false,
+ "level": "DEBUG",
+ "propagate": false,
"handlers": [
"console"
]
}
- },
- "version": 1,
- "disable_existing_loggers": false,
+ },
+ "version": 1,
+ "disable_existing_loggers": false,
"handlers": {
"console": {
- "formatter": "simple",
- "class": "logging.StreamHandler",
- "stream": "ext://sys.stdout",
+ "formatter": "simple",
+ "class": "logging.StreamHandler",
+ "stream": "ext://sys.stdout",
"level": "DEBUG"
- },
+ },
"info_file_handler": {
- "formatter": "simple",
- "backupCount": 10,
- "level": "INFO",
- "encoding": "utf8",
- "class": "logging.handlers.RotatingFileHandler",
- "maxBytes": 10485760,
+ "formatter": "simple",
+ "backupCount": 10,
+ "level": "DEBUG",
+ "encoding": "utf8",
+ "class": "logging.handlers.RotatingFileHandler",
+ "maxBytes": 10485760,
"filename": "info.log"
}
- },
+ },
"root": {
- "level": "DEBUG",
+ "level": "DEBUG",
"handlers": [
- "console",
+ "console",
"info_file_handler"
]
- },
+ },
"formatters": {
"simple": {
"format": "%(asctime)s - %(name)s - %(levelname)s - %(message)s"
diff --git a/plio/io/io_gdal.py b/plio/io/io_gdal.py
index 372b118f3da56a8324d2f23f13077a4df7955360..51834c6dc4f8f587c47abde8ae944da22863b499 100644
--- a/plio/io/io_gdal.py
+++ b/plio/io/io_gdal.py
@@ -198,6 +198,12 @@ class GeoDataset(object):
self._gcs = self._srs.CloneGeogCS()
return self._srs
+ @property
+ def nbands(self):
+ if not getattr(self, '_nbands', None):
+ self._nbands = self.dataset.RasterCount
+ return self._nbands
+
@property
def geospatial_coordinate_system(self):
if not getattr(self, '_gcs', None):
@@ -321,10 +327,8 @@ class GeoDataset(object):
@property
def coordinate_transformation(self):
if not getattr(self, '_ct', None):
- print('Getting CT')
self._ct = osr.CoordinateTransformation(self.spatial_reference,
self.geospatial_coordinate_system)
- print('CT', self._ct)
return self._ct
@property
@@ -332,7 +336,6 @@ class GeoDataset(object):
if not getattr(self, '_ict', None):
self._ict = osr.CoordinateTransformation(self.geospatial_coordinate_system,
self.spatial_reference)
- print(self._ict)
return self._ict
@property
@@ -558,6 +561,7 @@ def match_rasters(match_to, match_from, destination,
GRA_Cubic, GRA_CubicSpline, GRA_Lanczos, GRA_Average,
GRA_Mode}
"""
+
import gdalconst # import here so Sphinx can build the docos, mocking is not working
# TODO: If a destination is not provided create an in-memory GeoDataSet object
match_to_srs = match_to.dataset.GetProjection()
@@ -567,8 +571,8 @@ def match_rasters(match_to, match_from, destination,
match_from__srs = match_from.dataset.GetProjection()
match_from__gt = match_from.geotransform
- dst = gdal.GetDriverByName('GTiff').Create(destination, width, height, match_from.RasterCount,
- gdalconst.GDT_Float32)
+ dst = gdal.GetDriverByName('GTiff').Create(destination, width, height, 1,
+ gdalconst.GDT_Float64)
dst.SetGeoTransform(match_to_gt)
dst.SetProjection(match_to_srs)
diff --git a/plio/io/io_krc.py b/plio/io/io_krc.py
index 978ae8e8ddbcc384971579e691121408ee753a24..3831b3f7615c94fdcc6722a68ec318b006ca5043 100644
--- a/plio/io/io_krc.py
+++ b/plio/io/io_krc.py
@@ -364,9 +364,9 @@ class ReadBin52(object):
self.nseasons)
caseidx = np.repeat(np.arange(self.ncases), self.nseasons)
seasonidx = np.repeat(np.arange(self.nseasons), self.ncases)
- flt_seasitems = seasitems.reshape(len(self.vlabels),
+ flt_seasitems = seasitems.reshape(len(columns),
self.ncases * self.nseasons)
- self.seasons = pd.DataFrame(flt_seasitems,
+ self.seasons = pd.DataFrame(flt_seasitems.T,
index=[caseidx,seasonidx],
columns=columns)
self.seasons.index.names = ['Case', 'Season']
@@ -432,6 +432,9 @@ class ReadBin52(object):
#Extract the hourly temperature data
hourly2dataframe()
+ # Extract the seasons
+ season2dataframe()
+
# Extract by layer data from the data cube
layeritems = self.bin52data[: , self.ndx: , : , 5: 7, : ]
latitems2dataframe()
@@ -458,4 +461,4 @@ class ReadTds(object):
self.filename = filename
self.readbin5(headerlen)
print(self.ncases)
- assert(self.ncases == self.bin52data.shape[0])
\ No newline at end of file
+ assert(self.ncases == self.bin52data.shape[0])
diff --git a/plio/io/tests/test_io_controlnetwork.py b/plio/io/tests/test_io_controlnetwork.py
index 0e38111e3302f2917ee9076716fd5683544719cf..bf77fb477f229446c4b3eeffe26d8f811d3b4f1a 100644
--- a/plio/io/tests/test_io_controlnetwork.py
+++ b/plio/io/tests/test_io_controlnetwork.py
@@ -35,7 +35,7 @@ class TestWriteIsisControlNetwork(unittest.TestCase):
io_controlnetwork.to_isis('test.net', dfs, mode='wb', targetname='Moon')
cls.header_message_size = 78
- cls.point_start_byte = 65609 # 66949
+ cls.point_start_byte = 65614 # 66949
def test_create_buffer_header(self):
self.npts = 5
@@ -56,7 +56,7 @@ class TestWriteIsisControlNetwork(unittest.TestCase):
io_controlnetwork.to_isis('test.net', dfs, mode='wb', targetname='Moon')
self.header_message_size = 78
- self.point_start_byte = 66104 # 66949
+ self.point_start_byte = 65614 # 66949
with open('test.net', 'rb') as f:
f.seek(io_controlnetwork.HEADERSTARTBYTE)
@@ -73,13 +73,13 @@ class TestWriteIsisControlNetwork(unittest.TestCase):
self.assertEqual('None', header_protocol.description)
self.assertEqual(self.modified_date, header_protocol.lastModified)
#Repeating
- self.assertEqual([99] * self.npts, header_protocol.pointMessageSizes)
+ self.assertEqual([135] * self.npts, header_protocol.pointMessageSizes)
def test_create_point(self):
with open('test.net', 'rb') as f:
f.seek(self.point_start_byte)
- for i, length in enumerate([99] * self.npts):
+ for i, length in enumerate([135] * self.npts):
point_protocol = cnf.ControlPointFileEntryV0002()
raw_point = f.read(length)
point_protocol.ParseFromString(raw_point)
@@ -99,7 +99,7 @@ class TestWriteIsisControlNetwork(unittest.TestCase):
self.assertEqual(10, mpoints)
points_bytes = find_in_dict(pvl_header, 'PointsBytes')
- self.assertEqual(495, points_bytes)
+ self.assertEqual(675, points_bytes)
points_start_byte = find_in_dict(pvl_header, 'PointsStartByte')
self.assertEqual(self.point_start_byte, points_start_byte)
diff --git a/setup.py b/setup.py
index ca82517062677bfeed26e5018d5a51770cf169a7..9a3ee825e049d9fd13ec70ab06674c764e7ed2b8 100644
--- a/setup.py
+++ b/setup.py
@@ -42,11 +42,10 @@ def setup_package():
'pvl',
'protobuf==3.0.0b2',
'h5py',
- 'icu',
'pandas',
'sqlalchemy',
'pyyaml',
- 'certifi'],
+ 'networkx'],
classifiers=[
"Development Status :: 3 - Alpha",
"Topic :: Utilities",