contours display improvement

Author: AntSimi

src/py_eddy_tracker/eddy_feature.py

@@ -493,7 +493,7 @@ def get_index_nearest_path_bbox_contain_pt(self, level, xpt, ypt):
 
     def display(self, ax, step=1, only_used=False, only_unused=False, only_contain_eddies=False, **kwargs):
         from matplotlib.collections import LineCollection
-        for collection in self.contours.collections[::step]:
+        for j, collection in enumerate(self.contours.collections[::step]):
             paths = list()
             for i in collection.get_paths():
                 if only_used and not i.used:
@@ -503,7 +503,13 @@ def display(self, ax, step=1, only_used=False, only_unused=False, only_contain_e
                 elif only_contain_eddies and not i.contain_eddies:
                     continue
                 paths.append(i.vertices)
-            ax.add_collection(LineCollection(paths, color=collection.get_color(), **kwargs))
+            local_kwargs = kwargs.copy()
+            if 'color' not in kwargs:
+                local_kwargs['color'] = collection.get_color()
+                local_kwargs.pop('label')
+            elif j != 0:
+                local_kwargs.pop('label')
+            ax.add_collection(LineCollection(paths, **local_kwargs))
 
         if hasattr(self.contours, '_mins'):
             ax.update_datalim([self.contours._mins, self.contours._maxs])
@@ -516,7 +522,7 @@ def label_contour_unused_which_contain_eddies(self, eddies):
             sl = slice(None,-1)
             cor = 1
         else:
-            # cylonic
+            # cyclonic
             sl = slice(1, None)
             cor = -1
 

src/py_eddy_tracker/generic.py

@@ -211,3 +211,25 @@ def uniform_resample(x_val, y_val, num_fac=2, fixed_size=None):
     x_new = interp(d_uniform, dist, x_val)
     y_new = interp(d_uniform, dist, y_val)
     return x_new, y_new
+
+
+@njit(cache=True)
+def flatten_line_matrix(l_matrix):
+    """
+    Flat matrix and add on between each line
+    Args:
+        l_matrix: matrix of position
+
+    Returns: array with nan between line
+    """
+    nb_line, sampling = l_matrix.shape
+    final_size = (nb_line - 1) + nb_line * sampling
+    out = empty(final_size, dtype=l_matrix.dtype)
+    inc = 0
+    for i in range(nb_line):
+        for j in range(sampling):
+            out[inc] = l_matrix[i,j]
+            inc += 1
+        out[inc] = nan
+        inc += 1
+    return out

src/py_eddy_tracker/observations/observation.py

@@ -47,7 +47,7 @@
     ceil
 )
 from netCDF4 import Dataset
-from ..generic import distance_grid, distance
+from ..generic import distance_grid, distance, flatten_line_matrix
 from .. import VAR_DESCR, VAR_DESCR_inv
 import logging
 from datetime import datetime
@@ -1169,26 +1169,16 @@ def set_global_attr_netcdf(self, h_nc):
             h_nc.setncattr(key, item)
 
     def display(self, ax, ref=None, **kwargs):
+        lon_s = flatten_line_matrix(self.obs["contour_lon_s"])
+        lat_s = flatten_line_matrix(self.obs["contour_lat_s"])
+        lon_e = flatten_line_matrix(self.obs["contour_lon_e"])
+        lat_e = flatten_line_matrix(self.obs["contour_lat_e"])
         if ref is None:
-            ax.plot(self.obs["contour_lon_s"].T, self.obs["contour_lat_s"].T, **kwargs)
-            ax.plot(
-                self.obs["contour_lon_e"].T,
-                self.obs["contour_lat_e"].T,
-                linestyle="-.",
-                **kwargs
-            )
+            ax.plot(lon_s, lat_s, **kwargs)
+            ax.plot(lon_e, lat_e, linestyle="-.", **kwargs)
         else:
-            ax.plot(
-                (self.obs["contour_lon_s"].T - ref) % 360 + ref,
-                self.obs["contour_lat_s"].T,
-                **kwargs
-            )
-            ax.plot(
-                (self.obs["contour_lon_e"].T - ref) % 360 + ref,
-                self.obs["contour_lat_e"].T,
-                linestyle="-.",
-                **kwargs
-            )
+            ax.plot((lon_s - ref) % 360 + ref, lat_s, **kwargs)
+            ax.plot((lon_e - ref) % 360 + ref, lat_e, linestyle="-.", **kwargs)
 
 
 class VirtualEddiesObservations(EddiesObservations):