Merge pull request #72 from cdeil/from_numpy

Implement HipsTile.from_numpy and test
hipspy · Jul 17, 2017 · 2ab7f7a · 2ab7f7a
2 parents 2bc971f + 1b000d5
commit 2ab7f7a
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 6 deletions.
diff --git a/hips/tiles/tests/test_tile.py b/hips/tiles/tests/test_tile.py
@@ -75,9 +75,16 @@ def _read_tile(pars):
         filename = get_hips_extra_file(pars['filename'])
         return HipsTile.read(meta, filename)
 
-    # TODO: implement tests for the `from_numpy` method!
-    def _test_from_numpy(self):
-        pass
+    @requires_hips_extra()
+    @pytest.mark.parametrize('pars', HIPS_TILE_TEST_CASES)
+    def test_from_numpy(self, pars):
+        tile = self._read_tile(pars)
+        tile2 = HipsTile.from_numpy(tile.meta, tile.data)
+
+        # JPEG encoding is lossy. So in that case, output pixel value
+        # aren't exactly the same as input pixel values
+        if tile.meta.file_format != 'jpg':
+            assert_equal(tile.data, tile2.data)
 
     @requires_hips_extra()
     @pytest.mark.parametrize('pars', HIPS_TILE_TEST_CASES)
@@ -114,7 +121,7 @@ def test_write(self, tmpdir, pars):
         # Check that tile I/O works, i.e. round-trips on write / read
         tile = self._read_tile(pars)
 
-        filename = tmpdir / Path(pars['filename']).name
+        filename = str(tmpdir / Path(pars['filename']).name)
         tile.write(filename)
         tile2 = HipsTile.read(tile.meta, filename)
 

diff --git a/hips/tiles/tile.py b/hips/tiles/tile.py
@@ -139,13 +139,17 @@ def from_numpy(cls, meta: HipsTileMeta, data: np.ndarray) -> 'HipsTile':
         if fmt == 'fits':
             hdu = fits.PrimaryHDU(data)
             hdu.writeto(bio)
-        elif fmt in {'jpg', 'png'}:
+        elif fmt == 'jpg':
+            image = Image.fromarray(data)
+            image.save(bio, format='jpeg')
+        elif fmt == 'png':
             image = Image.fromarray(data)
-            image.save(bio)
+            image.save(bio, format='png')
         else:
             raise ValueError(f'Tile file format not supported: {fmt}. '
                              'Supported formats: fits, jpg, png')
 
+        bio.seek(0)
         raw_data = bio.read()
 
         return cls(meta, raw_data)