Merge 70ac699 into 452d962

.gitattributes

@@ -0,0 +1 @@
+*.fits binary

regions/io/fits/core.py

@@ -23,7 +23,7 @@ class FITSRegionParserError(ValueError):
 
 language_spec = {'CIRCLE': ['X0', 'Y0', 'R0'],
                  'POINT': ['X0', 'Y0'],
-                 'BOX': ['X0', 'Y0', 'R0', 'R1', 'ROTANG0'],
+                 'BOX': ['X0', 'Y0', 'R0', 'R1'],
                  'ANNULUS': ['X0', 'Y0', 'R0', 'R1'],
                  'ELLIPSE': ['X0', 'Y0', 'R0', 'R1', 'ROTANG0'],
                  'ELLIPTANNULUS': ['X0', 'Y0', 'R0', 'R1', 'R2', 'R3', 'ROTANG0'],

regions/io/fits/read.py

@@ -165,7 +165,7 @@ def _get_col_value(self, colname, default=None):
             if np.isscalar(val):
                 val = np.array(val).reshape(1, )
             if index is not None:
-                if index < len(val) and val[index] != 0:
+                if index < len(val) and val[index] is not None:
                     return val[index], unit
                 else:
                     raise ValueError("The column: {0} must have more than {1} value for the "
@@ -201,6 +201,9 @@ def parse(self):
             for x, y in zip(coords[0], coords[1]):
                 coords_new += [x, y]
             coords = coords_new
+        elif self.region_type == 'BOX':
+            # Add a 0 rotation to turn it into ROTBOX
+            coords.append(0.0*u.deg)
 
         region_type = self.region_type.lower()
         if region_type in reg_mapping['FITS_REGION']:

regions/io/fits/tests/test_fits_region.py

@@ -38,8 +38,9 @@ def test_file_fits(filename):
     assert shapes[5].region_type == 'point'
     assert shapes[6].region_type == 'point'
     assert shapes[7].region_type == 'polygon'
+    assert shapes[8].region_type == 'rectangle'
 
-    for x in range(7):
+    for x in range(8):
         assert_allclose(shapes[x].coord[:2],
                         [table['X'][x][0], table['Y'][x][0]])