Simplify NumPy slices

visualizer/plotting.py

@@ -81,8 +81,8 @@ class TimeSeries(Plotter):
         axes.plot(data[:, 0], data[:, meas.field])
         avg = np.nanmean(data[:, meas.field], dtype='float32')
         axes.hlines(y=avg,
-                    xmin=data[:, 0][0],
-                    xmax=data[:, 0][-1],
+                    xmin=data[0, 0],
+                    xmax=data[-1, 0],
                     linestyle='-',
                     alpha=0.7)
         axes.set_ylabel(f'{meas.title} ({meas.units})')
@@ -98,7 +98,7 @@ class TimeSeries(Plotter):
         )
         name = station['name']
         plt.suptitle(f'{meas.title} ({meas.units}) measurements, '
-                     f'{name} Station, {data[0][0].year}')
+                     f'{name} Station, {data[0, 0].year}')
         return savefig_response(fig, filename=(
             f'{cls.name}.{station_id}.{year}.{meas.slug}.png'
         ))
@@ -161,14 +161,14 @@ class Overlay(Plotter):
             axes.plot(datasets[0].data[:, 0],
                       dset.data[:, meas.field],
                       **alpha_kw,
-                      label=f'{dset.name} {dset.data[0][0].year}')
+                      label=f'{dset.name} {dset.data[0, 0].year}')
         for dset in datasets:
             dset.avg = np.nanmean(dset.data[:, meas.field], dtype='float32')
             axes.hlines(y=dset.avg,
-                        xmin=datasets[0].data[:, 0][0],
-                        xmax=datasets[0].data[:, 0][-1],
+                        xmin=datasets[0].data[0, 0],
+                        xmax=datasets[0].data[-1, 0],
                         alpha=0.7,
-                        label=f'Avg {dset.name} {dset.data[0][0].year}')
+                        label=f'Avg {dset.name} {dset.data[0, 0].year}')
         axes.set_ylabel(f'{meas.title} ({meas.units})')
 
         for dset in datasets:
@@ -186,7 +186,7 @@ class Overlay(Plotter):
             fontsize='small')
         axes.legend()
         axes.tick_params(labelbottom=False)
-        title_dsets = ' / '.join(f'{dset.name} Station, {dset.data[0][0].year}'
+        title_dsets = ' / '.join(f'{dset.name} Station, {dset.data[0, 0].year}'
                                  for dset in datasets)
         plt.suptitle(f'{meas.title} ({meas.units}) measurements, '
                      f'{title_dsets}')