moved plot functions from utils/geoutils to visualization/matplotlib

Author: mxaviersmp

pymove/tests/test_utils_geoutils.py

@@ -1,8 +1,4 @@
-import os
-
-import matplotlib.pyplot as plt
 import numpy as np
-from matplotlib.testing.compare import compare_images
 from numpy.testing import assert_array_equal, assert_equal
 from pandas import DataFrame
 from pandas.testing import assert_frame_equal
@@ -30,75 +26,6 @@ def test_v_color():
     assert_equal(expected_2, geoutils.v_color(line_2))
 
 
-def test_plot_coords(tmpdir):
-    d = tmpdir.mkdir('preprocessing')
-
-    file_write_default = d.join('plot_coords.png')
-
-    filename_write_default = os.path.join(
-        file_write_default.dirname, file_write_default.basename
-    )
-
-    coords = LineString([(1, 1), (1, 2), (2, 2), (2, 3)])
-
-    fig, ax = plt.subplots(figsize=(21, 9))
-    geoutils.plot_coords(ax, coords)
-    plt.savefig(filename_write_default, dpi=100)
-
-    test_dir = os.path.abspath(os.path.dirname(__file__))
-    data_dir = os.path.join(test_dir, 'baseline/plot_coords.png')
-
-    compare_images(
-        data_dir, filename_write_default, 0.0001, in_decorator=False
-    )
-
-
-def test_plot_bounds(tmpdir):
-    d = tmpdir.mkdir('preprocessing')
-
-    file_write_default = d.join('plot_bounds.png')
-
-    filename_write_default = os.path.join(
-        file_write_default.dirname, file_write_default.basename
-    )
-
-    bounds = LineString([(1, 1), (1, 2), (2, 2), (2, 3)])
-
-    fig, ax = plt.subplots(figsize=(21, 9))
-    geoutils.plot_bounds(ax, bounds)
-    plt.savefig(filename_write_default, dpi=100)
-
-    test_dir = os.path.abspath(os.path.dirname(__file__))
-    data_dir = os.path.join(test_dir, 'baseline/plot_bounds.png')
-
-    compare_images(
-        data_dir, filename_write_default, 0.0001, in_decorator=False
-    )
-
-
-def test_plot_line(tmpdir):
-    d = tmpdir.mkdir('preprocessing')
-
-    file_write_default = d.join('plot_line.png')
-
-    filename_write_default = os.path.join(
-        file_write_default.dirname, file_write_default.basename
-    )
-
-    line = LineString([(1, 1), (1, 2), (2, 2), (2, 3)])
-
-    fig, ax = plt.subplots(figsize=(21, 9))
-    geoutils.plot_line(ax, line)
-    plt.savefig(filename_write_default, dpi=100)
-
-    test_dir = os.path.abspath(os.path.dirname(__file__))
-    data_dir = os.path.join(test_dir, 'baseline/plot_line.png')
-
-    compare_images(
-        data_dir, filename_write_default, 0.0001, in_decorator=False
-    )
-
-
 def test_encode():
     lat1, lon1 = -3.777736, -38.547792
     lat2, lon2 = -3.793388, -38.517722

pymove/tests/test_visualization_matplotlib.py

@@ -1,6 +1,8 @@
 import os
 
+import matplotlib.pyplot as plt
 from matplotlib.testing.compare import compare_images
+from shapely.geometry import LineString
 
 import pymove.visualization.matplotlib as mpl
 from pymove import MoveDataFrame
@@ -156,3 +158,72 @@ def test_plot_trajectories(tmpdir):
                    filename_write_default,
                    0.0001,
                    in_decorator=False)
+
+
+def test_plot_coords(tmpdir):
+    d = tmpdir.mkdir('visualization')
+
+    file_write_default = d.join('plot_coords.png')
+
+    filename_write_default = os.path.join(
+        file_write_default.dirname, file_write_default.basename
+    )
+
+    coords = LineString([(1, 1), (1, 2), (2, 2), (2, 3)])
+
+    _, ax = plt.subplots(figsize=(21, 9))
+    mpl.plot_coords(ax, coords)
+    plt.savefig(filename_write_default, dpi=100)
+
+    test_dir = os.path.abspath(os.path.dirname(__file__))
+    data_dir = os.path.join(test_dir, 'baseline/plot_coords.png')
+
+    compare_images(
+        data_dir, filename_write_default, 0.0001, in_decorator=False
+    )
+
+
+def test_plot_bounds(tmpdir):
+    d = tmpdir.mkdir('visualization')
+
+    file_write_default = d.join('plot_bounds.png')
+
+    filename_write_default = os.path.join(
+        file_write_default.dirname, file_write_default.basename
+    )
+
+    bounds = LineString([(1, 1), (1, 2), (2, 2), (2, 3)])
+
+    _, ax = plt.subplots(figsize=(21, 9))
+    mpl.plot_bounds(ax, bounds)
+    plt.savefig(filename_write_default, dpi=100)
+
+    test_dir = os.path.abspath(os.path.dirname(__file__))
+    data_dir = os.path.join(test_dir, 'baseline/plot_bounds.png')
+
+    compare_images(
+        data_dir, filename_write_default, 0.0001, in_decorator=False
+    )
+
+
+def test_plot_line(tmpdir):
+    d = tmpdir.mkdir('visualization')
+
+    file_write_default = d.join('plot_line.png')
+
+    filename_write_default = os.path.join(
+        file_write_default.dirname, file_write_default.basename
+    )
+
+    line = LineString([(1, 1), (1, 2), (2, 2), (2, 3)])
+
+    _, ax = plt.subplots(figsize=(21, 9))
+    mpl.plot_line(ax, line)
+    plt.savefig(filename_write_default, dpi=100)
+
+    test_dir = os.path.abspath(os.path.dirname(__file__))
+    data_dir = os.path.join(test_dir, 'baseline/plot_line.png')
+
+    compare_images(
+        data_dir, filename_write_default, 0.0001, in_decorator=False
+    )

pymove/utils/geoutils.py

@@ -2,23 +2,18 @@
 Geo operations.
 
 v_color,
-plot_coords,
-plot_bounds,
-plot_line,
 create_geohash_df,
 create_bin_geohash_df,
 decode_geohash_to_latlon,
 
 """
 
-from typing import Optional, Text, Tuple, Union
+from typing import Optional, Text, Tuple
 
 import geohash2 as gh
 import numpy as np
-from matplotlib.pyplot import axes
 from numpy import ndarray
 from pandas import DataFrame
-from shapely.geometry import LineString, MultiLineString
 from shapely.geometry.base import BaseGeometry
 
 from pymove.utils.constants import (
@@ -74,86 +69,6 @@ def v_color(ob: BaseGeometry) -> Text:
     return COLORS[ob.is_simple + 33]
 
 
-def plot_coords(ax: axes, ob: BaseGeometry, color: Optional[Text] = 'r'):
-    """
-    Plot the coordinates of each point of the object in a 2D chart.
-
-    Parameters
-    ----------
-    ax : axes
-        Single axes object
-    ob : geometry object
-        Any geometric object
-    color : str, optional
-        Sets the geometric object color, by default 'r'
-
-    Example
-    -------
-    """
-    x, y = ob.xy
-    ax.plot(x, y, 'o', color=color, zorder=1)
-
-
-def plot_bounds(ax: axes, ob: Union[LineString, MultiLineString], color='b'):
-    """
-    Plot the limites of geometric object.
-
-    Parameters
-    ----------
-    ax : axes
-        Single axes object
-    ob : LineString or MultiLineString
-        Geometric object formed by lines.
-    color : str, optional
-        Sets the geometric object color, by default 'b'
-
-    Example
-    -------
-
-    """
-    x, y = zip(*list((p.x, p.y) for p in ob.boundary))
-    ax.plot(x, y, '-', color=color, zorder=1)
-
-
-def plot_line(
-    ax: axes,
-    ob: LineString,
-    color: Optional[Text] = 'r',
-    alpha: Optional[float] = 0.7,
-    linewidth: Optional[float] = 3,
-    solid_capstyle: Optional[Text] = 'round',
-    zorder: Optional[float] = 2
-):
-    """
-    Plot a LineString.
-
-    Parameters
-    ----------
-    ax : axes
-        Single axes object
-    ob : LineString
-        Sequence of points.
-    color : str, optional
-        Sets the line color, by default 'r'
-    alpha : float, optional
-        Defines the opacity of the line, by default 0.7
-    linewidth : float, optional
-        Defines the line thickness, by default 3
-    solid_capstyle : str, optional
-        Defines the style of the ends of the line, by default 'round'
-    zorder : float, optional
-        Determines the default drawing order for the axes, by default 2
-
-    Example
-    -------
-    """
-    x, y = ob.xy
-    ax.plot(
-        x, y, color=color, alpha=alpha, linewidth=linewidth,
-        solid_capstyle=solid_capstyle, zorder=zorder
-    )
-
-
 def _encode(lat: float, lon: float, precision: Optional[float] = 15) -> Text:
     """
     Encodes latitude/longitude to geohash.

pymove/visualization/matplotlib.py

@@ -5,14 +5,19 @@
 plot_trajectories,
 plot_traj_by_id,
 plot_all_features
+plot_coords,
+plot_bounds,
+plot_line,
 
 """
 
 from typing import TYPE_CHECKING, Any, Callable, List, Optional, Text, Tuple, Union
 
 import matplotlib.pyplot as plt
-from matplotlib.pyplot import figure
+from matplotlib.pyplot import axes, figure
 from pandas.core.frame import DataFrame
+from shapely.geometry import LineString, MultiLineString
+from shapely.geometry.base import BaseGeometry
 
 from pymove.utils.constants import (
     DATE,
@@ -319,3 +324,83 @@ def plot_all_features(
 
     if return_fig:
         return fig
+
+
+def plot_coords(ax: axes, ob: BaseGeometry, color: Optional[Text] = 'r'):
+    """
+    Plot the coordinates of each point of the object in a 2D chart.
+
+    Parameters
+    ----------
+    ax : axes
+        Single axes object
+    ob : geometry object
+        Any geometric object
+    color : str, optional
+        Sets the geometric object color, by default 'r'
+
+    Example
+    -------
+    """
+    x, y = ob.xy
+    ax.plot(x, y, 'o', color=color, zorder=1)
+
+
+def plot_bounds(ax: axes, ob: Union[LineString, MultiLineString], color='b'):
+    """
+    Plot the limites of geometric object.
+
+    Parameters
+    ----------
+    ax : axes
+        Single axes object
+    ob : LineString or MultiLineString
+        Geometric object formed by lines.
+    color : str, optional
+        Sets the geometric object color, by default 'b'
+
+    Example
+    -------
+
+    """
+    x, y = zip(*list((p.x, p.y) for p in ob.boundary))
+    ax.plot(x, y, '-', color=color, zorder=1)
+
+
+def plot_line(
+    ax: axes,
+    ob: LineString,
+    color: Optional[Text] = 'r',
+    alpha: Optional[float] = 0.7,
+    linewidth: Optional[float] = 3,
+    solid_capstyle: Optional[Text] = 'round',
+    zorder: Optional[float] = 2
+):
+    """
+    Plot a LineString.
+
+    Parameters
+    ----------
+    ax : axes
+        Single axes object
+    ob : LineString
+        Sequence of points.
+    color : str, optional
+        Sets the line color, by default 'r'
+    alpha : float, optional
+        Defines the opacity of the line, by default 0.7
+    linewidth : float, optional
+        Defines the line thickness, by default 3
+    solid_capstyle : str, optional
+        Defines the style of the ends of the line, by default 'round'
+    zorder : float, optional
+        Determines the default drawing order for the axes, by default 2
+
+    Example
+    -------
+    """
+    x, y = ob.xy
+    ax.plot(
+        x, y, color=color, alpha=alpha, linewidth=linewidth,
+        solid_capstyle=solid_capstyle, zorder=zorder
+    )